latest 6 messages by Mr`Jim
+
[2014-08-29T08:42:25Z]
Mr`Jim
Okay, so I tried, checking out my feature branch, then, 'git rebase --onto master', cherry picking my single file commit, then 'git push --force' and that seems to have got me the results I require (my pull request just has the one change in now).
+
[2014-08-29T08:32:18Z]
Mr`Jim
is fast forward like rebasing?
+
[2014-08-29T08:31:41Z]
Mr`Jim
tobiasvl: one easy solution is I can just create a new branch (based on upstream) cherry pick my commit and commit, push + pull request that, but I was interested to find out if I can solve this properly rather than just creating a new branch (useful to know for future too).
+
[2014-08-29T08:30:10Z]
Mr`Jim
tobiasvl: my feature branch is based on my working branch, which is update to date with upstream but also has a lot of my other (unrelated) changes on. Does it sound like fast-forwarding could be the solution? If so I am happy to google for this term (it isn't something I have done before).
+
[2014-08-29T08:26:42Z]
Mr`Jim
Essentially I want to 'reset' (wrong word) my feature branch to the upstream version, then cherry pick my one fill commit, and then commit + push + create pull request.
+
[2014-08-29T08:26:00Z]
Mr`Jim
I have created a feature branch from my working branch, committed and pushed a single file change and then gone onto the website to create a pull request. I have realised I should have created by feature branch from the upstream branch (as right now it is based on my working which has lots of other changes in). Can I fix this?